Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

[Linux] Auto-detect clang version #5346

Merged
merged 1 commit into from
Feb 6, 2018
Merged

Conversation

BredPet
Copy link
Contributor

@BredPet BredPet commented Feb 5, 2018

- Auto-detect if there is clang symlink and version is not specified
- Remove hardcode clang version from msbuild file

@dotnet/arm32-corert-contrib please review

@BredPet BredPet changed the title [Linux] Auto-detect clang version [WIP] [Linux] Auto-detect clang version Feb 5, 2018
@BredPet BredPet changed the title [WIP] [Linux] Auto-detect clang version [Linux] Auto-detect clang version Feb 5, 2018
@@ -16,6 +16,7 @@ See the LICENSE file in the project root for more information.
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CppCompilerAndLinker Condition="'$(CppCompilerAndLinker)' == '' and '$(TargetOS)' == 'OSX'">clang</CppCompilerAndLinker>
<CppCompilerAndLinker Condition="'$(CppCompilerAndLinker)' == '' and '$(TargetOS)' == 'Linux' and '$(__ClangMajorVersion)' != '' and $(__ClangMinorVersion) != ''">clang-$(__ClangMajorVersion).$(__ClangMinorVersion)</CppCompilerAndLinker>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please set CppCompilerAndLinker in buildvars-setup.sh instead?

The msbuild files under src/BuildIntegration are included in the ILCompiler NuGet package. They are used in dotnet cli integration. buildvars-setup.sh is for building CoreRT itself.

@BredPet
Copy link
Contributor Author

BredPet commented Feb 6, 2018

@jkotas please review again

	- Auto-detect if there is clang symlink and version is not specified
	- Remove hardcode clang version from msbuild file

Signed-off-by: Petr Bred <bredpetr@gmail.com>
Copy link
Member

@jkotas jkotas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@jkotas jkotas merged commit 744716e into dotnet:master Feb 6, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants